address reviewer concerns wrt inno setup.

diff --git a/appveyor.yml b/appveyor.yml
index a3f5bcc1d59e065304c4e6ccb008547fc8c92e15..9e059546ee1b5009f057f1fed0000af43c00852d 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,18 +40,25 @@ build_script:
         Get-Location
         qmake -query
         # mimic creator shadow build to match Inno setup file
-        New-Item ..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release -type directory -force
-        cd ..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release
+        $gpsbabel_build_dir = "build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release"
+        $gui_build_dir = "build-app-Desktop_Qt_5_5_1_MinGW_32bit-Release"
+        # make sure we are staring with a clean build directory
+        Remove-Item "..\$($gpsbabel_build_dir)" -Recurse -ErrorAction Ignore
+        New-Item "..\$($gpsbabel_build_dir)" -type directory -force
+        cd "..\$($gpsbabel_build_dir)"
         qmake ..\gpsbabel\GPSBabel.pro -spec win32-g++
         mingw32-make qmake_all
         mingw32-make
         if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode)  }
         # copy GPSBabel.exe for use by test_script
+        Remove-Item ..\gpsbabel\release -Recurse -ErrorAction Ignore
         New-Item ..\gpsbabel\release -type directory -force
         Copy-Item release\GPSBabel.exe ..\gpsbabel\release\GPSBabel.exe
         cd ..\gpsbabel
-        New-Item build-app-Desktop_Qt_5_5_1_MinGW_32bit-Release -type directory -force
-        cd build-app-Desktop_Qt_5_5_1_MinGW_32bit-Release
+        # make sure we are staring with a clean build directory
+        Remove-Item "$($gui_build_dir)" -Recurse -ErrorAction Ignore
+        New-Item "$($gui_build_dir)" -type directory -force
+        cd "$($gui_build_dir)"
         qmake ..\gui\app.pro -spec win32-g++
         mingw32-make qmake_all
         mingw32-make
@@ -68,7 +75,8 @@ build_script:
         & 'C:\Program Files (x86)\Inno Setup 5\ISCC.exe' ..\gui\setup.iss
         cd ..
         $sha=(git rev-parse --short HEAD)
-        Get-ChildItem .\gui\release\*.exe | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha).exe" }
+        Get-ChildItem .\gui\release\GPSBabel-*-Setup.exe | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Setup.exe" }
+        Get-ChildItem .\gui\release\GPSBabel-*-Manifest.txt | % { Push-AppveyorArtifact $_.FullName -FileName "GPSBabelTest-$($env:APPVEYOR_BUILD_VERSION)-$($sha)-Manifest.txt" }
       }
       elseif ($env:platform -eq "mingw")
       {

diff --git a/gui/setup.iss b/gui/setup.iss
index c5734a05b0d6228be5222c1b221110e9926be0aa..30dd4bf238ee33bf95d35d1f84472f812179702a 100644 (file)
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -4,11 +4,9 @@
 ; synchronized.\r
 ;\r
 ; Script for generating installation setup program for GPSBabel\r
-; Uses the Inno setup compiler.  Typically used from the command\r
-; line "makesetup.bat" which copies QT system files which\r
-; the Innosetup compiler cannot handle.\r
-;\r
-; So it is not a good idea to run this file from the Inno Setup GUI.\r
+; Uses the Inno setup compiler.\r
+; windeployqt should be run to prepare the necessary Qt files before\r
+; running Inno Setup.\r
 \r
 [Setup]\r
 ; NOTE: The value of AppId uniquely identifies this application.\r
@@ -25,6 +23,7 @@ DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r
 OutputBaseFilename=GPSBabel-1.5.4-Setup\r
+OutputManifestFile=GPSBabel-1.5.4-Manifest.txt\r
 SetupIconFile=images\babel2.ico\r
 Compression=lzma\r
 SolidCompression=yes\r
@@ -37,11 +36,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked\r
 \r
 [Files]\r
-; This isn't as wreckless as it seems; these directories are populated on a\r
-; controlled way by the batch file.\r
-;Source: qtdir\bin\*.dll;              DestDir: "{app}"; Flags: ignoreversion\r
-;Source: qtdir\plugins\*;              DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
 Source: qt.conf;                               DestDir: "{app}"; Flags: ignoreversion\r
 \r
@@ -58,9 +52,6 @@ Source: ..\..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release\release\gpsbab
 ; Source: gpsbabel_*.qm;               DestDir: "{app}\translations"; Flags: ignoreversion\r
 Source: gpsbabelfe*.qm;                DestDir: "{app}\translations"; Flags: ignoreversion\r
 \r
-; Now translations from Qt's own UI stuff.\r
-;Source: qtdir\translations\*;                 DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
 ; Miscellaneous\r
 Source: COPYING.txt;                   DestDir: {app}; Flags: ignoreversion\r
 ; Source: AUTHORS;                     DestDir: {app}; Flags: ignoreversion\r

diff --git a/gui/setup.iss.in b/gui/setup.iss.in
index 2c14bb8f1601941efaaefa48dbe9d24d70a9f0b8..9c9e463dbb0d9301c2e664149a66f855d2ba83b4 100755 (executable)
--- a/gui/setup.iss.in
+++ b/gui/setup.iss.in
@@ -4,11 +4,9 @@
 ; synchronized.\r
 ;\r
 ; Script for generating installation setup program for GPSBabel\r
-; Uses the Inno setup compiler.  Typically used from the command\r
-; line "makesetup.bat" which copies QT system files which\r
-; the Innosetup compiler cannot handle.\r
-;\r
-; So it is not a good idea to run this file from the Inno Setup GUI.\r
+; Uses the Inno setup compiler.\r
+; windeployqt should be run to prepare the necessary Qt files before\r
+; running Inno Setup.\r
 \r
 [Setup]\r
 ; NOTE: The value of AppId uniquely identifies this application.\r
@@ -25,6 +23,7 @@ DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel\r
 OutputDir=release\r
 OutputBaseFilename=GPSBabel-@PACKAGE_VERSION@@PACKAGE_RELEASE@-Setup\r
+OutputManifestFile=GPSBabel-@PACKAGE_VERSION@@PACKAGE_RELEASE@-Manifest.txt\r
 SetupIconFile=images\babel2.ico\r
 Compression=lzma\r
 SolidCompression=yes\r
@@ -37,11 +36,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked\r
 \r
 [Files]\r
-; This isn't as wreckless as it seems; these directories are populated on a\r
-; controlled way by the batch file.\r
-;Source: qtdir\bin\*.dll;              DestDir: "{app}"; Flags: ignoreversion\r
-;Source: qtdir\plugins\*;              DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
 Source: qt.conf;                               DestDir: "{app}"; Flags: ignoreversion\r
 \r
@@ -58,9 +52,6 @@ Source: ..\..\build-GPSBabel-Desktop_Qt_5_5_1_Mingw_32bit-Release\release\gpsbab
 ; Source: gpsbabel_*.qm;               DestDir: "{app}\translations"; Flags: ignoreversion\r
 Source: gpsbabelfe*.qm;                DestDir: "{app}\translations"; Flags: ignoreversion\r
 \r
-; Now translations from Qt's own UI stuff.\r
-;Source: qtdir\translations\*;                 DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
 ; Miscellaneous\r
 Source: COPYING.txt;                   DestDir: {app}; Flags: ignoreversion\r
 ; Source: AUTHORS;                     DestDir: {app}; Flags: ignoreversion\r